some smaller improvements