Fixing things! and into-walljump