clean up of source, improved data interpretation