minor errors and import enumerating