Updates, bug squashing