added a lot of stuff, no TODOs left