Improved documentation and messages. Eliminated one TODO and added two.

Signed-off-by: David Noble <dnoble@splunk.com>