Images and Fixes

See above