Updated Setting + Changed some vals