Fix a bunch of small stuff with the locket and general store.