Flushed out CMD options, Added disable option.

Fixed minor issues with doc format