New usage output, fix some text in output, added tests.