continued updates to match spec. bespoke page and some stuff on range