fixed up alignments and other things