Issue8 9 monitor fixes

Issues #8 and #9 fixed