Acrobatics fixed.

Minor fixes:
1) falling into water fix
2) removed jump state (could be implemented later)
3) moved the code a bit