Proper collision handling, jump head space check, make code more readable