edit and other minor alignments