Improved logs and other things