refactoring references
datacontext autosaving; underscore + underscore string added