Added eshop, minor cleanup