corrected parsing functions; removed an obsolete comment