add shop and other more changes