flm + minor changes