Significant code cleaning; timed switching of Jon's face on collision