A couple of things to watch for, 1 the brushes are very fiddly to hold in place while the armature is reassembled, there must be a special tool. I think I used some string then pulled it out. 2 the self park switch is very sensitive and can work itself a bit loose then they just run and run. 3 the wiper is always live, its stops because of the self park, the wiper switch just by-passes the self park. The self park switch grounds the armature to earth to stop it quickly, if this is not connected it will slow but not stop in time, if its connected wrong you get an almighty short.