Standalone executable and other cli cleanups