fixed confusing names
commit before changing parser to use multiple datalines per line of text
more fixes