Some fixes, including jumping