small bug fixes
reversed seach order
added optional closing , in enum values
fine tuning naming and find behavior