added monitor server, cleanup