Fix powerups spawning in blocks and fix swap doing an inifinite loop
Merge branch 'hotfix/v0.2.2-BETA'