Fix work on broken files; Reduce redrawings;