Added more todo's and fixed some things