fixed staging bugs in dev