s3: becomes s3:// - warning: untested

Also cleanup some comments