Last of the changes needed for figures.
Added last few missing functions for figures