Improved some stuff, removed some comments, did TODOs