fix bibliography, improve layout