cleanup logging and add some lines