Add fixes suggested by Helen and improve threshold table