fixed annotation of scoping/scoped sites
cleaner handling of lists