added shop support, other tweaks