Various improvements.

Please let me know if you require any changes.

Thanks for the plugin.
:+1: