Merge branch 'master' into wip

Merging fixes from master and some other fixes.
Merge branch 'wip' of https://github.com/legospacy/rainbow-arena into wip