cwpp support
cwpp fixes
more cwpp stuff