some minor changes before merge