Attemped fixes

Here we go.  lets see what this does.