Fixing Location/Velocity output