clean up, but bugs remain
fixed some will and qos bugs