schema parsing and markup fixes

wip