Cp modal fix

Closes
styxit#172
styxit#170
styxit#166