Fix parser, now everything is really really really fast