Ironed out some bugs with enter/leave messages