Updated image handling
Various tweaks