cosmetic changes. Added new class to deal with boundary alignments (not used yet)