Tentatively fixed and complete, take 2.