s2nd pass on moveit. added looping and capping on wp's.