new CWC, bug fixes, oh my