fixed staging bugs in dev branch