started some minor cleanup & added some TODOs