Updated some things that need changing.