update some implemented TODOs