fix compile errors
Smooth stopping a bit