Fixed commands/File Saving functions