add some more modules, update some others