Some smaller improvements and corrections