Monitoring probe

Besides adding monitoring capabilities some small bug-fixes were introduced.