edit acount implemented and fixed some bugs