add returns and fix up alignments