Make max/min prevent moves already outside the bounds

Previously allowed free movement outside the bounds until they were reached.
Now forces movement towards the bounds