Account self deletion & minor fixes