new cli app, some fixes