improved formattting
improved logging