Completion of outstanding work and remedying defects

• 扫尾工作和修补缺陷的完成