fixed more modules.