Fixed some bugs and did some general code improvement.

git-svn-id: https://plugins.svn.wordpress.org/rocket-galleries/trunk@904372 b8457f37-d9ea-0310-8a92-e5e31aec5664