more instrument refactoring
major stuff changed

I'm not committing enough