changed a couple more things