Issue 181 fix some mod searching

See commit summaries for specifics.

@jerone and @Zren ... how about this?