refactorings, updated log display
fixed conflict