more folder fixes