Finish second pass edit

harmonize with UML models, try to make valid according to JSON schema
spec
formatting 'beautify'