Data update, minor bug fixes.