minor changes and reverts