Some feedback in the form of a pull requests

Fixes #1, and I didn't create issues for the others. The commits contain more information about the reasons why I think they should be done that way.