Changed the description of some figures
Fixed conflicts