Updated a number of things