Correct mistakes
Add some features