* Some fix and some change

* a way to bored to list them all.