work on configuration manager
merge some fixes from master