typo and some small upgrades