minor tweaks, trying to find source of the memory leak when switching
screens