Smooth moving and units color and little fixes