Completed point 10

Completed the point 10 and fix some minor issues.