Add docs, fix endless scenario, improve output mechanism