figures and fixes