Further adjustments to everything