Progress in Image class plus correction of major bug in label