Minor fixes. Removed unused options.