Fix app
Add some comments