Reorganized and fixed references, updated index