Prezi final tweaks

Closes #348 (and fixes bugs discussed on call)