Importing ben's changes

merging changes to master then I'll set up a new repo on GSPBetaGroup