updated a few figure making functions