Added Boris suggestions and fixed the figures