added more shop features and such