Fix some shop features
Merge pull request #372 from grosenbaum/update-features

Update features