Improve parser
Fix read line
Fix read_line problem