Some fixes and more refinement.