ENH: mark journals vs conference + updated activities
COMP: conflicts