Implementing many of Asger's comments (Jul 21)