route change event to remove message and some other small fixes