Few improvements and fixes

Found out it was smartindent shitting up the indentation, and added TODO and friends.