improved logging
improved logging