made small changes, awaiting testing of full system