removed dead sites, cleanup, and misc bug fixes