Expanded comments and small clean ups to Happiness Upload