small upgrades and nits