minor additions and fixes to last commit, edited todo list