Tweaks and comments per @asutherland