Some updates

Here are some suggested updated, I will continue later.