Added and changed a number of things that would normally be done in multiple changes but I forgot.