fixed criteria bugs exposed by tests

alignment criteria now use the same underlying logic.