images + various minor improvements