Bug fix for import. Sugu will do more later.