add some
fix bug