changes in dev branch
Fixed staging bugs in development branch.