Add executable, fix minor bug