tuning generics, member enums
12 files changed