Bug fixes.
Merge conflict.
Fixed underscore error.
Merge conflict again.