marker second fix + more