updates based on fix notes