Some updates.

This should handle issue #1.
Everything is centralized now in the 2 main plugins.
Very lightweight, we could probably do even better if we wanted.