Updates & New Features to The Plugin

Hello, I needed to add some functionality to the plugin and decided to do some optimizations. I think it would be worthwhile to integrate them into the official plugin.