Improved logging and some fixes