Fix many bugs and rework MarkerPlus