Pulled Yuans Doxygen and commited some state changing updates