Updated some more stuff