Minor edits to code, added some more goals to the TODO list in the Readme