Several updates and fixes

image updates and code fixes
updates and fixes