add cancel flash + correct redirects