Data/method edits.
?
Fixed typos and merge conflict.