Partially Trapping changes, other gen 1 fixes
More fixes to partial trapping moves