markup fixes nearly done