Improve executable

Fixes #84 and #85