Some modules, some fixes, removed monitor