fix jump logic, invert goal default
added warp square support