Fixed a nasty parser bug

Also the addition of import2, your standard import, but WITH
WILDCARDS!!!