Auto-commit:  fixed references partly according to Oscars wishes