some small updates and use of the registration listener