various cleanup, add TODOs