Multiple smaller improvements