fix style and add some new