More indent and edge marker fixes