Added minor corrections and cleaning (fast and temporary)