first batch of modifications for alignment of documentation, schema and headers