some improvments from the other branch
alignments
disabled useless key