Fixed up some leaf ids, still a whole lot more to go