Cleanup, terminology, additional links