shop fix and sql structure added