Added automatic renumbering, display_str() support