some minor improvements, bug fixes from upgrades