Add forgotten files and remove TODOs