added Align2 and IsAligned2; cleaned up Align/IsAligned