alignments and some client issues