fixed abstract, merge problem, typos, grammer