Finished updating some stuff