added alerts, started improvement on user management