file separated and fix some erata.
file separated and fix some erata