Improve figures

Had a rainy day and WiFi...