Started work on data presentation code; miscellaneous changes