Fixups after Ilya's review
logging with log4j was implemented