dummy instrument implementation fixed, presentation layer adjusted, various refactorings