Issue 92: More finishing touches