Great revamp to the bibliography, striving for some consistency, impossible to achieve