Renaming things, cleaned whitespace, styling, added some comments, added to README/TODO.