Changes in importer and model

This pull request serves as a synchronisation of code while I'm having vacation.

The worksheet is working, but could some real checking.

Some changes in the core: ask Dennis and Morris