Change instrumenter and plugins

Removes spin locks, fix things.