Testing + minor upgrades