better parsing of puz format