Add Idiom object, that contains all idiom instances
Minor edits and additions