improved folder watching