removed dead sites, cleanup, misc bug fixes