Updated parser to handle the crap around clues better