Fix errors
Add more code