some minor changes to the way files are watched