Made lots of changes to lots of things