fix lock issue, begin finalizing drawtypes (MapNode still needs a bit of
reworking)