more manufacturers/components in picture_edit fixes