Small improvements, possible to run from menu in app.