more markup fixes and consolidation