Fix parsing, add round scoring