minor tweaks & fixes