More cleanup, more annotations, more TODOs

And most, if not all, TODOs, are always the same: null, null, null.