Update Hexic a bit
Change ifs to matching