Various updates to the modules