fixed more modules