Edits in some pages + scripts enhanced