Committing all my changes.

Imports now work for any file specification. That is all.