Fix some smaller bugs and prepare plugin for "official" release