Fixing a bunch of TODO's.