tidies up project, adds todos