Added line number counting, more accommodating point parsing and updated