Bug fixes and reduction in TODO list

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