Added account updates and more error catching