cleanup. fixes. been shifting things over to wsc, so adapdting to changes.