Added upgrade labels, bug fixes.