todo added, some old stuff removed, some bibtex added