Bugfix and rewrote ordermonitor