Added rate monitor, and some bug fixes