a number of bugfixes with images