Add files and fix code
Add more comments