fixing bugs found in staging