Updated lots of things