Add Rollbar error handling, lots of cleanup