quite a few spider fixes