Added motion limit in the x direction, see #15.  Also refactored the y limits for greater consistency.