Fixed flash message, routing, etc.
merge