fixed user quits
adding some more stuff to Aop module...