Updated a few more things