Minor changes from final run through.