cleanup
Cleanup; minimum of TODOS/Ideas.
Merge pull request #1 from icarot/master

Cleanup/TODO