Fixed for the most part, some alignments are wrong