uncomment some older material
rework text to make clear; final comment from Rodrigo