general upgrades to my gen routines