folder rename, minor bug fix