updates, listeners fix