cleared out some chaff, added better logging