Pin Spidering and bug fixes