Added few more modules
Some fixes