Some house keeping changes before starting on images