controller added. modular imports. bug fixes.