Removed a bunch of TODO's and cleaned up a few things.