Added messages for requesting and returning folder contents; Fixed some bugs