monit works now, better shairport/upnp, cleanup