Fixed overzealous momentum
Some minor code sanification.  Why didn't I do this years ago?
Some cleanups and prep for future work
Changing this to && instead of || messes up the boundaries some, but is faster.