Add activities to vendor + small corrections

I accepted this change. I had to apply it manually because it is mixed with the other non-related issues. It is better to make individual pull requests for each logically related change, but it is MUCH better to make a pull request than not to do one, so thank you very much :-)