Code review

In general I think this module looks good.

I only have a few questions and comments.
Fixed.