various fixes and added logger