Simplified some code for datareader and inputrecord.
Added future renaming of 2 functions.