bug fixed & improve monitor-client