Reduced verbose-ness of operation, error messages unchanged. Converted spaces to tabs.