Several Fixes

I believe that these fix several of your issues.