Fixed spacing and import issues

First space after a command was removed. Now it leaves it as is, which allows pre-process to be idempotent which is important.

Importing files didn't look in the folder of the actual file. Now it does look in that folder