new shop && AI fixes