fixing a problem where the merge didnt pull in all my changes
adding in some more fixes with heredocs and interpolation