Hopefully last commit before pushing to prod

Some cleaning, updated the comments, and hopefully we can push to 1.0
soon.