add better logging to all