changed a few more things