Bug fixes, upgrades and small improvements.