Small little changes with some //: TODOs