What did you pratice on Khan Academy? Perhaps a course? I am looking at it right now.I find practicing on Khan Academy has been very helpful.
Mainly because you can get help on specific kinds of questions you need extra help with. You can track your progression and progress.
There are a LOT of word problems on there so that will help with the problem solving portion.