spider and some minor fixes