Quite a lot of pull requests

Sorry about that!