fixes and log improvements