I thought I would update this...In case anyone else is reading this.
I am still dealing with night wakings some, but probably nothing unusual. I tried tanking up and then shh/pat one night and I got her to go from 11 to 6, so I think we are going to be making progress in that area.
As far as naps, I am so happy. She suddenly is taking a 1 1/2 hour nap in the morning, and 2 hour nap in the afternoon, and 1/2 hour c/n before bed. She is most usually not waking up at all in those naps.
I attribute the wakings I was having to OS. After a lot of reading in the book, I decided to have a longer wind down routine. I make sure I also do calm activities for about 10 minutes before wind down.