further changes to logging output and minor things