some fixing and twixing