Fixed some bugs and a bad module name