add more ccdcam functionality; consolidate naming