Fix several bugs & Do lots of small modifies.