Don't slip too long (reduced to 1sec)
Faster swerving during slipping
Fix: Removed duplicate line from merge conflict