Finishing touches before presentation
Fixes #5