schema parsing and markup fixes

wip
7 files changed