more challenge/activity info
fix merge