Misc cleanups and TODO's