More Image effects and general changes