Some collision and motion changes/adds