Update Manual and make it more uniform with others