few edits, some commented out testing code