some updates and upgrades