Some bug fixes and some added hotspot flexibility

Hello and thanks for the great plugin!

The commit notes pretty much tell the story, I just needed a little more flexibility with the hotspots and thought I would pitch in if you are interested.

Thanks again for all your work, this was just what I needed!