Typo/bug fix + working on vertex detection