Incorporates a number of suggestions from Steven & wisdom from Scott.