Added verbose output, some more TODOs, and a few minor changes.