Bug fixes + Refinements on TODOs

TODO Count: 25, not including documentation TODOs (i.e., those embedded within doc comments)

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