fixes, working on rest of TODOs