Fixing kicks and jumps and stuff