some fixes and removed logging