Bugfix/image tweaks