Some changes to pretty much everything