multiple tweaks and fixes to the presentation