Fixed the TODO a little, added some things to do..