added test case, more verbose help, other small changes