General fixes and bug squashes to the presentation imagineer