Some rewriting
A few updates