Accumulted minor changes to everything