more flexible import, and updated to reflect evolver edits