Re-added nSkipEvents lost in merge; Some small fixes to jet algos