changes in some classes and conf files