Update status messages so they reflect what is happening.
Merge branch 'updated' into gb_master