Fix small issues and streamline the actual bibliography entries