fix bugs
figures done through 1.22