Issue 92: Finishing touches