Work on bugs

Why?