Empty folder bugfix, minor changes