minor changes before merge into master