more refactoring: API/config stabilizing