fixed wrong initialisation of figures and added breaks