Fixed some functionality, added some TODOs