Added more sites. Fixed bugs found during adding sites.