slight upgrades to some modules