added todos and minor spelling changes