Work on bugs

Urchin