Fixed that silly bug with the export/import confusion (see: previous commit). Also some style fixes.