Updating zil progress and fixes I pre-merge.