Checking that the dev branch works
Fixed staging bugs in develop branch.