folder accessors clean-up. still needs a lot of TLC