fix enumeration & lots more exception logging