various changes; added dwc; worked on plugin