A long list of changes

Ill sort through this later