fixes and updates
added logger