CFF plotting updates