Updated to master:

- library stab issues
- deriving -> derive
- {mod} -> {self}