Update structure; fix some errors.