Updated job, recharge tweaks