Update and general house keeping

Added table of contents,
cleaned up some tabs and removed some spaces.