renaming and number node fixes