Perfomance improvements. Refactoring.
Refactoring.
Added couple instruments.