Big update

This fixed a ton of things.