Fix duplicate flash messages and improve a bit