added but not imported enumeration;
minor cleans