improvements and schema.org integration