Added new module.
Fixed bugs.