updated bibtex file and completed the calculation (with some values that really don't seem to work...