Some upgrades and typos