minor tweaks.g