solved/removed all the TODOs