add corrected schema files and bug fixes