fix module reference
Various refinements, including fix for new import behavior of Idris 0.9.16