grdshop: fixes from review
probably need a pass here