Updated a bunch of shit