Images and slight machinefix