minor changes per @rschooley