Fixed some TODOS
Fixed stuffs