Bug fixes for build 240.
Added some new upgrades too.