Fixing stuff for presentation