few minor fixes
Merge branch 'website' into staging2