Minimal changes and corrections.