minor edits fixes #598
Merge branch 'grants_wizard' into testing