Minor upgrades an corrections.