logging and bug fixes
Merge remote-tracking branch 'origin/fixes/upgades' into fixes/upgades