Fix some includes and TODOs
Merge pull request #5 from escherba/dev

Fix some includes and TODOs