Minor fixes, minor additions.