remove sticking on jump, better collision diagnostics