Bug 787

This resolves bug 787 and cleans up the output of the advance HUD.