folders changed plus minor changes