Gameplay pass #3

- bug fixing