logs and fixes