updates per @brutasse's comments