Updated some things
More things