changes relevant to the bibfile branch merge