Many tweaks & changes that should be committed separately.