more walljumping
merged