final nits from Vivien's review