catching up minor tweaks