Several updates/improvements, see changelog

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