Fix missing arnwine annotation (#51). Fix toggle edge cases.