Jump fix, minor animation fix

SYNC UP
Merge