fixes for phaser 2 (WIP)