Improved logging
Small fixes