Updated a lot of shit