More on the TCJA & Gift and Estate Tax