Doxygen now outputs private, static, etc
Documented most of upgrade.h