Added user feedback on error, and changed some of the activity headers to something more appropriate.