Final tweaks

by John Phillips