various smaller improvements