small corrections and log messages added