Fixing wheels+friction
merge