Even more changes

Changing a lot of items