Refactored a bit and tweaked help output.