Fixed level skipping and death issues