marker fixes (still broken)