1ere page OK
some clean-ups