Add Fee and fix some bug