Happiness improvements (#71)