Many little refinements here and there