Added support for multi word phrases
assorted edits