Patched some bugs temporarily, added external account checks