Sample fixes; work on factoids