some cleanups, added TODO list