some improvements and user registry implemented