Update makefile
Fix some import stuff
Move docs around
Bump TODOs
Remove dead code