minor upgrades in code