test and argument cleanup; version bump