One final thing, some good things to pickup for your stock motor:
5 pairs extra brushes
1 bottle of tribo power matrix drops
Good comm stick ( team orion makes a good one )
fiddlestick ( great for measuring your springs, the colors can lie )
You can also buy an brush hood alignment bar but that can get pricey if you get a good one. For now, the stuff listed above should get you going well.