Rename the variables holding the module name and module strings
Ensure modules closest to the source are preferred
Add documentation for -p option