Fix typo
Fix inconsistent spacing
Add some more TODOs
Remove Makefile in favor of Cabal