Fixed some minor bugs for the presentation