Auto-commit:  Some minor changes and updates