fix details & nits per @dstillman