backport of dismount and flying-kick fixes.  need to back-port gui
updates