bugfixes and made logging smother

Change-Id: I11e08dd078543b8640d01261fe1c43ee66b124ff