Erico: fixing figure problems; ready for compile