Updated more things