fixed spelling errors added a few TODOs and cleaned up broken code that

Zaine is still working on this