cleaned up and fixed marker drawing