Removed some unnecessary header files

Added some todo's
Removed a few warnings