SpideyBugs bugs fixed