Fixed up a little bit, some more TODOs