Release-05 - Integrate a bunch of comments from Fred Baker