Work on bugs

Student-intern