add tests
improve terminal