added fat funtionality to figures, fixed small bugs