Text parser improved & bug fix