fix logging and add some more