Tweaks to interface and EPUB generation