One major fix

Left in an exit; commend that Nathan picked up .. some other small hacks too ...