Add support for multiorbit alphabets
Some cleanup