added flashes and comments