Wrap up changes provided by Burt and some minor additions.