Added error-tracking, among other features