added wording for all object types, removed oneline