Fix some code style
Add some new questions