Bugs fixed and new modules