small changes
fixed staging bugs