commented out rubber bullets for the moment

plus a few shop changes