some bugs in modular parts fixed