Some minor updates to the module