Misc fixes

git-svn-id: https://plugins.svn.wordpress.org/imsupporting/trunk@866212 b8457f37-d9ea-0310-8a92-e5e31aec5664
Lots of fixes

git-svn-id: https://plugins.svn.wordpress.org/imsupporting/trunk@866368 b8457f37-d9ea-0310-8a92-e5e31aec5664
Added some extras that were missed.
This should be it for a while now.

git-svn-id: https://plugins.svn.wordpress.org/imsupporting/trunk@866380 b8457f37-d9ea-0310-8a92-e5e31aec5664
Fixes

git-svn-id: https://plugins.svn.wordpress.org/imsupporting/trunk@866381 b8457f37-d9ea-0310-8a92-e5e31aec5664