Updated a bunch more