added various TODOs and misc changes