Minor changes

minor changes commited in order to have a revert point