*minor tweaks