Fixed general store up, misc