Kirsan changes

Fixed various aspects of the kirsan option.