small tweaks, but still won't train order>2 without thrashing