bug fixes; implementing shop plugin