I ended up frogging what I had and started over. When I got to row 24, I marked off each set on a piece of paper. I ended up repeating the pattern 7 times. And I have 25 stitches which I think is what I'm supposed to have. So HOPEFULLY that'll fix my issues.