Add TODOs and more whitespace corrections