Various ES changes

Budget; recurring; split