fixing bugs found during in-store testing.