design corrected
name corrected
fixes