fix bugs.
local changes.
merge