tweaks for lens_charge section
changed disk-like and cigar-like in several places in shapes section