Review comments.

I decided to just write them as a commit :)