I did my very best to fix #76, #81 & #84