Add Some Feature, and Fix some BUG.