More

Changed a few more things