better markers and header updates