Made updates to a lot of stuff