Improvements based on validator.s3.org