some touchups, still having problems with the pipeline on test-ok