fixes, refactoring configuration compare v. beta 0.4