more PBJR improvements