I have fixed the shop to be less scuffed by making the following change:
There was a way to dupe items by moving a bottle from the shop to an occupied hot bar slot and it (sometimes) increasing the wrong bottle count in the shop. Now it just places the bottle from the shop, and you pick up the one that was in the hot bar slot.
That's pretty much it, let me know if you guys find any problems!