GSW: lots of little tweaks