Upgrades

skrumbled at gmail dot com