flash and minor changes