added in figure setup stuff