another weave of fixes and QA