some alignments issues solved