Fixed staging bugs in develop branch.
Resolve issues in HW6 in develop branch.