Finishing touches to #13