Fixed some todo's