Fixed bugs, added speed on escape entry