Modules updated and module set tweaked