more modules and bug fixes