Add executable (WIP) and other improvements.