Guido mods
Merge branch 'Guido stage behavior'
small typo correction