resolved most TODOs