Lot's of small fixes. Now you can reference other files.