Correct lot of bug & presentation