clean up; fix markers