More revision, eliminated a few todos and fixed some references