update doco
update diagnostic
kinda 5.8 support