bug fixes and improvement in monitor task