More smooth movement work
Fix removed line
Fixed NRE