Error fixing + JUMP FOR JOY