Slight improvements to everything