Switched discovery to a background fixes. Bug fixes.