Added more logging
various fixes