Resolved more TODOs, cleaned up examples some.