misc upgrades to latest foobunny code