Beta 3 - Bug fixes

Fixed collection of results.
Fixed recovery from errors.