More modules and fixes