Folder commands - little bugfix and cleanup