fixed minor issues, staged for amazon s3