couple updates thanks to @wang-arthur