Made several important bug fixes that accured from tests
Oviridden done() method