Cleaned up some of the HashMap iterations and updated the plugin version number