minor tweaks to handling of closed mode