Some minor changes
Some minor changes to ctl