improvements for Gods, plus importer improvements - still not finished there