Improved spawning method
Spelling fixes and removed auto generated TODO's