2 spider added, 2 bugs fixed