minor bug changes

fixed enumeration bugs