Implemented flavor-by-name
Resolved some edge cases