fixed parsing problem on lines just containing \r; updated plans