Bug fix in exit, other small tweaks