Resolve issues in HW6 in develop branch.