updates to markers, merged mo's final stuff with everyone else's
.