bring in flash message changes from blogament