Added small bug fixes and more error catching after live tests.