latest changes, mostly formatting.