some more tweaks to the G-S model