Added various error bars. See commit messages for details.