Better non-module (local install) support; UM whitespace changes