More cosmetic changes; fix bug with journal-id-type