Fixed some minor issues, added simple check to see if account exists