Lots of little fixes, comments, etc...
Fixed bug. Oops. Don't use last commit.