Latest updates

* Fixed the validator
* Fixed up the importer
* other enhancements