make minor changes to error and flash messages
Merge branch 'progress'