A few minor tweaks trying to get closeAll to work.