various upgrades and small improvements