boom!
wsdata.h
some cleanup