The return of the plugin

Done everywhere. Also allows consting of some members.