image fix and tweaks