integrated modules. fixed bugs