File monitor, many fixes.