Use more of flash messages, clean up a little.